Got rid of some pesky enumerations. Let's try an easier way this time.