Update google_checks.xml and minor refactoring. #320