Remove the intermediate variable, and move the option closer to where it's used, as in some cases we created the variable, but could return with an error before it was used. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>