Refactored some redundancies (including null checks).