Add Nonnull annotations on return types