Further simplification of Vim config.