g4 test: minor cleanup.