Merge "Change grep -w to checking matches after the fact rather than modifing regex. This lets '(x)\1' match, as reported by Isabella Parakiss."