Re-fix "empty loop body" warnings broken by previous commit