Again, changes due to vim plugin management