João,

The attached patch should satisfy the requisites you outlined above.