OK - you win this time gadget. I'll submit it as a separate PR, probably today sometime (its a Friday kind of task).