Hi Jamie,
I can't reproduce your error from the information you gave in the tracker issue. If anyone else gets the same error and we can track down why/how it happens then we could take it from there. I also tried commenting out those lines myself and all seemed to work well (but I was in a hurry so maybe I missed something somewhere). I'll be pretty busy until end of March so sorry I can't help anymore, but I would advise using a test server with different Moodle versions (maybe fresh installs) etc to see if you can get it to work.
Cheers,
Barry