Partial refactor to support distributional question/answers.