Comment 4 for bug 1254511

Yeah, I guess that makes more sense than handling NIL separately. Here's an updated patch, with the ticket number added.
For this to get applied, should I push it into the repo myself?