I have pics of three full-stock J&S rifles (that have enough detail to see the keys clearly) and they have very small oval headed keys - the oval barely looks larger than the opposite side.That's all I can contribute to the question. Have never personally seen a square key.
My last duty was inside Cheyenne Mountain. Lots of Canadian officers. My assignment was classified.