Small refactor again.