Partial refactor to support answer type parameters.