Some minor fixes in response to vim-sensible