Replace remaining NonNull statements with Validate statements