Make handling of default values less magicy