Switch `<>` back to `[]`

Here we go.

Thoughts?
I have never had an issue using `%` in Vim. We do not support the use of `<` or `>` as an operator inside of a generic type parameter list, which means there is no problem finding the matching `<` or `>` when using `%`.