Cleanup whitespace
Remove some unneeded primitives
Give one more bit to oops so we can have 32K objects
Rename OTI_* to OOP_*