A very drafty draft at the moment
Fixes
Helps with #21392.
Likely subsumes Call Arity and its fix to #7994 (closed).