This previously supported deleteing flags or value args. Deleting flags
may not be required (and if it is, we can always add a second function).
I prefer having a simpler implementation at the cost of little
duplication.
Test: none
Change-Id: Ice16dd54185c65fec99882ff65e982804478c85f
357b25cd23