go back to extracting vars in local scope for partials
rewrite with emphasis on file-based templates