re-trampolined G.skip, and other little clean-ups