Still true. I'd like to rip a lot of this out and start again (the module isn't too big actually at <300 lines) - but I think that is a task for another day...