More work on atomize.patch.