Fix up recent object model cleanups