The changes introduced in the previous commit were leading to
non-termination. We fixed that.