Small style cleanups for argument handling

We don't use spaces before () and an if and also removes a check for a
case that could never happen.
Copy StringIO changes to 2.0 mode as well