Not sure why these were commented out -- vimsensible?
Bunch of neglected changes.