Cleanup.
Use c++11 override on VIRTUAL_FROM.
Use nullptr
More of the same.
Enum class.