c2c83e97c3
This reverts commit 511dd4f4383b1c2873beac4dbea2df302f1f9d0c along with a couple fixes. Original message: Now the context is the first, rather than the last input. This better matches the rest of the infrastructure and makes it easier to move these types to being declaratively specified. Phabricator: https://reviews.llvm.org/D96111