Minor cleanup before major types rework