Add some more checking -- don't want non-gc values to sneak in again