Fix our violations of disallowMultipleVarDecl
Enhance google's preset. Fixes #506