NS_ENUM support plus some constants refactoring
Omitted conversion from NSAssertX to NSAssert