@Andrew:

Noted for a future patch.

Thank you :)