Honestly, I wrote this very late at night and I think you're right specifically, but also I really hate the way that code looks in general. Since I think this patch is basically going to be abandoned at this point (with new commits later) I'm going to write something there that is more generic.