Rework option parsing to not break