[vim keymap] Style tweaks

* simpler concat
* less escaping
* shave a line
* throw early
* throw new error
* single quotes
* format returns
* rm unneeded parens
* add whitespace
* re-add braces