[[ RefactorSyntax ]] Removes useless 'if' in the last commit - and fixes StringRef leak