Fixed ConstantValue (removed UnionWraper). Improved the parsing of command expressions and fixed column numbers