[FOLD] Clean up a weird loop 'countdown' construct.
[FOLD] Update TODO