Ugh, I think your change is the straw-on-the-camelback for the tabular form.  The whole thing would be better captured using the Sphinx '.. cmdoption::' markup.