Extract #entry_for_content_type helper
Render subtype-less content types as a single option

This means we have a mixture of <option> and <optgroup> tags inside the
content type drop-down, which is probably what we want for now.