Miscellaneous cleanup (like using class-level initializers for members)