[rules-dev] Parser changes in trunk (for the next version)