Ok, but we can still simplify it.   My point here was that my original regex was overly complicated..