Start refactoring the way FIFOs are handled.