Fix an issue introduced when adding constructor scope.