Tweaks to geometry modifications

Fixes tests seen to fail in #488 (which are currently failing in master).