Ensure that min + prod files are generated properly.
Merge pull request #4986 from rjackson/moar-cleanup

Ensure that min + prod files are generated properly.
Replaces single multiline var statement with multiple var statements
Merge pull request #4987 from locks/patch-1

Replaces single multiline var statement with multiple var statements