Extend 6e957bb3a4ee3c5baaa8d7bdc562aa32462e7e53 to arbitrary defaults