Tidy Templates 2 of 6

Second wave: template_container( NT_( 'foo' ),,, calls get cleaned up along with a couple of lines above and below. All "qp-tt" branches will affect only files with @package templates ... except for one or two that need to move into that package.