Check length of flavor changes/merge

[plexish]

Some flavor lines have been expanded, but look like the originals were contracted to avoid hitting a char cap. Check if Guv'ner's works properly, then merge.