Move everything which belongs together into one common struct.  This
simplifies the implementation of several queue operations.