more normalization of trees wrt to functions and blocks