Update expanded regex with Vim corrections