Incorporated code review suggestions re. nil-safe methods