More tiny refactor.