Move off lombok a lot more, and start using apache common's Validate class instead of @NonNull