Be explicit with the types being streamed out, to match the code that is

in the method just before. Otherwise this relies on the api not changing,
which would be easy to miss, and it relies on enums being streamed out as
int.
(cherry picked from commit 513cf202ec325ecad61999143c63012ea1a2a453)