Yeah, I think you're right. I'll make the simplification and then merge :)