Minor adjustment for space saving.
Minor bug fix to account for "no timeout" option.