Fixup --timeout command line option