Cleanup. No functionality change intended.