Add whitespace around nested templates.

This prevents a parsing error with older compilers
(clang at least) which misinterpret '>>' as an operator.

Update from bug833385v10 patch.