Fixes bug where -e and -dt flags did not work anymore.

This was introduced recently during the overhaul of the option
processing.

Change-Id: Ife68ee4f53b54198333c1c135f7f5d9994081b1f