Remove use of bare enum keyword