More deadly refactoring.