Fix simplifications for choice rules.
Add test cases in gringo 3 notation.