Refactoring; Fix tests; No longer require `base` option; Change code style: requireMultipleVarDecl -> disallowMultipleVarDecl