Fix overly aggressive refactoring.