macvim: combine conditionals, update comment