Backport changes to @overload.
2 files changed