- Moved some defines into an enum.