Reapply r158700 and fixup patches, minus one hunk that slipped through and

caused a crash in an obscure case. On the plus side, it caused me to catch
another bug by inspection.

llvm-svn: 158767