Bug 1093307 - Part 2: Make OOM flushing paths more straightforward; r=jonco