Somewhat like patch 3/3 in the other MR, could you try to split patch 3/3 a little? E.g., common shader constants, compute shader constants, domains shader constants, and so on. We'll probably still end up with a bunch of "miscellaneous" constants at the end, but hopefully few enough of them that it's not much of an issue.