Changes that play better with Macvim.