Fix some refactoring misses.