geom(4): Fix some of the "set but not used" warnings
The few I've left in place look like potential bugs.
Sponsored By: EPSRC