Passes tests on 5.8.9

Some dependency hell, some tweeaks on regexps with named captures.