Move away from lombok a ton more, removing usages of @NonNull