redundant <list> around <choice>

<list> would mean that multiple values from <choice> would be allowed as
value (separated with whitespace), but this isn't actually true here.
Not to mention that our parser completely ignores <list>.

Change-Id: I43275c588d885429f5ea53c2f950a0011c2bb1bc