Adjusted command-line options to reflect old behavior.