Added rx-escape and rx-choice.
Fixed invert-dfa and rx-not.