Changed defines to enums.