Mike,
Please update your Questionnaire module to the most recent version available for 1.9 in contrib. That's questionnaire/locallib.php Revision 1.49.2.53.
This should really fix the problem. If not, then please give more details about your problem, i.e. please provide the exact complete question type, question text, question choices, glossary term(s) included, etc. so that I can understand.
You say "I changed line 3024 to remove the + 1:" but there are only 2988 lines in that file!
Joseph