This is a bit hackish, but allows for a lot of followup cleanups.

llvm-svn: 302845