Fixed bugs in add/remove class shorthand.