[trivial] Simplify use of Optional.or

Also correct checkArgument call.