Further gc-integration test tweaks.