improved fallback and regexp transformer