Rearranged patch queue for further simplification and cleanup