Fixes and features

Partial support for choice elements with instance choices in repeating
sections. Fixes to delete links in default template.