Clean up some mess made by earlier refactoring.