Fix race-condition, improve one-at-a-time handling a bit more.