We need these changes in master for testing, worry about these test after.
Don't lose default values set within a nested block.