Agree. Refactoring `nonNull` so that those can be object would be nice (more explicit in error trace).