Fix --timeout, etc

Detection of options with two leading dashes