Add %TC and %ST substitution patterns (needs generalization).