Reverted to old behaviour regarding IOTAs, kept new implementation. Problems with higher-order expressions.