Improvements to adapt() in QuestionNode form; store choice items in AnswerDomainChoice object