handle constants
fix binding kind names
escape the separator ^ because it has special meaning in regexp
Merge branch 'state-transformers'