Started to remove the #defines for inheritables.

Sure its a bit more for people to type, but its not a lot and it makes it
much more easy for new users to trace where the code actually lives.
It probably also saves memory when you get down to it removing all of
these defines.
More work on removing defines for inheritables.