Upgrade to latest option parser