More incremental conversion from Ioke to Atomish.