Improve recognition of template parameters.

Before: return a<b &&c> d;
After:  return a < b && c > d;