* group together key validity refactors
These were never used, and poking arbitary data into objects from other packages seems confusing at best.