[[ RefactorSyntax ]] Fix various bits and pieces
[[ Unicodify ]] Fix Windows file close issue