More work on removing global defines for inheritables.
Also fixed some typos.
Removed more global defines.