Drop any None and thus previously required default values