Added env visitor pattern and started WF choice checking.