Set variable defaults directly to correct variables

Avoid variable joggling just for the purpose of having default values.