Sample clip adjustment

One of the other thing limiting the range of motion (#444 (closed)) was the sample clips crashing into the illumination.

This MR slightly reduces the radius of curvature and squeezes the back of the sample clip to reduce the overhang at the back. The clamp point is unchanged.

The MR first tidies up the sample clip code before adjusting. It may be clearer to review commit by commit.