[PATCH 00/12] Rework option parsing in preparation for destination remapping