Revert to old option handling, broke -C. Added a TODO to
improvie it, though I guess currently it's better to leave
it as it is. Updated usage accordingly.