Remove silly 'Void' type.
Add 'choice-else' and 'option-else' for matching.
Make 'showVector' a bit prettier.