Clean up with easy default-value construction.