Slight cleanup left out of refactor.