Going forward, please please avoid mixing refactoring changes (touch lots of files, no behavior change) with behavior changes. Makes code review much easier.