Switching from eval to stream wrapper

Fix for "new templating engine (eval free)" of FS#1174