Fixup Pull2452 to match interface and abstract function diagnostics.