Change some #defines into enums.