Please omit unrelated changes (separate commit for nonnull refactoring)