Hah, yeah we can do that. I had simplified an earlier edit, but didn't notice that it could be simplified more. Will update with commit message.