Do yet more general cleanup.