Really apply improve-type-safety-and-prototype-matching-20020226.