Add more stringTupleNGroupExtractors, remove shortcuts,