Do some trivial cleanup.