Revert "fix up types.toStatement and return an expressionStatement if all else fails"

This reverts commit 740193b1e2d5397c661ea3cd1f0b8445308461ab.
remove nodes replacing in util.template