Heh, indeed :) So scratch the last bit and keep it the way it is. Still, we need a test and the question remains for keeping unused code like `disableLoop`; my take is that would be easy to readd in the future if we ever need it :)