Switched from non-terminating λSimp to terminating