Clean up classes for new clang features