Issue #2: futher gmp re2 cleanup