Cleaning up Hirosh's seamless changes