Cleanup. No functional change intended.