Simplify -o a bit. Also simplify the code that gets run when
$1 is a file.