Issue #24: cleanup to not make re2 an external depdency