Fix our violations of disallowMultipleVarDecl
Enhance google's preset

Closes gh-609
Fixes #506