Both internal and external ones.
Takes care of #1056988 and #1081981.
Also addresses an issue discovered while looking at #1082939.
Plus a bunch of additional stuff.