In the olden days I had one little Diana M22 in 177. When I went out shooting I just picked up that little gun and some pellets (Marksman's finest!)...
Just looking at some old AGW's March 1994 they tested the new HW97 and yes complete with square section spring. I know they fitted them to the MK2 97...