Deployment performance improvement

valuesWithDefaults can actually be relativly expensive, don't call it
unless it is actually needed. Note that 'expensive' in this case is
relative as this method is called a lot.