Both of your corrections (<simple-chars>+ shouldn't expand to the empty string, <string-chars> shouldn't be required to quote colons) sound good to me.