Updating: more work on contrib/pcre