Defaulted quantities should be defaulted everywhere.

Fixes #1581