Cleaned up data structures, moved to an inactive set, which should speed up marking