Template argument cleanup.
Merged