Improve vimcom related code.