Alchemy cleanup, part 1.