MDL-34640 question repsponse files: remaining tidy up of this code.