Move default value processing into existing for loop.