Pick up teleshoes' regexp comments/suggestions from the pull request.