Move default argument values from definition to declaration

Fixes a bug introduced in #790.