Minor improvement to message parsing regexs