Stop passing  and  variables around
Revert "Stop passing  and  variables around"

This reverts commit 560c34cea4496ff3e975abc9151cbd1e8f2f68db.
Revert the revert, because I meant to amed, not revert.  Hey, I'm still learning git.

This reverts commit df004d99a3d78248df7eb1380bdda169b511b664.
Merge branch 'MDL-4013-question_filtering_api_c' of github.com:MorrisR2/moodle into MDL-4013-question_filtering_api_c