Move some transformations into transformer.
More estraverse fixes.
Move more things into transformer.