Add angle bracket matching keys.
Don't match raw blocks.
Group keybindings.
Tweak settings.
Fix incorrect operator for set union.