Bubble mutex stuff up into BufferFiller only for now. Dynamic gen swapping not supported. #163