Corrected classes.
Slightly improved macros.