Added more shortcircuit variables for certain classes.
Used new class variables and removed FIND-METACLASS.