Fix semantics when compiling with older clang.

Clang 4, for instance, ends up with the return statement in the
body of the if -- and so main returns immediately, unless you
pass in arguments.

Follow-up to 2883e87a