[[ RefactorSyntax ]] Several minor fixes