allow more expressions in curly-brace names

Also:

* fix indentation for nested if and try blocks

* test compilation of tpope's surround.vim