Fix a couple of laggard refactorings