Cleaning up vimc config a bit due to merging.