Convention cleanup.