Haha! Glad to know we were on the right track. It looks like that change is on track to be included with the next tagged release – 3.11 from the looks of it.
The override of the
prepare_query/3 might still be useful (but nothing there to commit to the repo, just to add for our personal preferences)