Fixed some generic SOF2 related things and cleaned up some Q3-specific code.