New template test, and fix in bindings analysis in nested templates.
Missed a file removal.