We have to use the `@SingleEntity SomeType body` trick all over the place because it's currently impossible to do what this would implement. I can audit where we use this to see how many could actually use this new functionality (e.g., have only a few fields) vs. how many require more complex objects where it makes sense to use `@SingleEntity`.