WIP: War on DecorateError

This may not make sense, but I think maybe it does. It's a WIP follow-up to !2857 (comment 457436954) so I can see how big the CI fail whale is and whether to proceed with directly using the GRPC APIs inline, or keep using these wrappers.