Cleanup.
Move some object bracing logic into transformer.