Added raw string indicators where needed in the p1-7 re.sub-s