Improve layout (see e.g. ROOT-6440).
Fix remaining part of ROOT-6440: handle templ templ args in fwd decls.