Small consolidation w/ new "addRemClass" method.