Refactored link selection

Merged some duplication between the ordinary LinkType and the rendering
of Optional, pursuant to making Choices work very differently.

Renamed the "Enumerated Category" flag to "Is a Choice", based on
conversation with Anna a month or two ago.  This will eventually feed
into a Choice-building wizard.