Improved snippet 'guard' for vim & shrink indent to 2.