Rewrite options argument handling (Step 1)