More -WaE: nested template problems.

Change-Id: I896773bd37d855b83e9dfc260cae293a6f92100a