Remove unnecessary defensive code. Minor refactor.