That class comparison stuff in the core should be removed. I don't remember what the blockers were for it.