Changed handling of defaults defined as closure