Replace some more NonNull annotations with Validate statements