I'd vote out of scope for this refactor.