Further speed-up and the simplification of the template engine.