Fix breakage from refactoring.