Use simpler form for default values

Also fix tiny bug at L91