Cleanup
Middle-matching for template names, fixes
PostfixCompletionOptionsPage2 initial