I think it would be better if the FIFO size weren't hard-coded here. You could add a FIFO method to get the size. If we change this in the future there will be a lot of places to update this.