Convert some more #defines to enums