More lint fixes.
Replaced enum class with Python 3.4 enums.