swift234

[serialization] Restructure function template to work around ToT Clang bug.

The bug in question is PR9685, but the code is probably easier to read with
the extra template arg anyway.

Swift SVN r6064