Okay, thanks. I tried asking if this patch would be accepted in IRC before posting this to prevent this kind of situation but nobody responded. I don't know enough about the codebase to implement the suggested solution, so I'll let you all decide if you want to do it.