Split up FIFO drain

@jcw will hate me for all these counters. Not very minimalist at all!