Use the constants macro
Remove Specialzed Atrribute support. This didn't need a type
Some local changes I had lying around