Adjust suspend handling to marry the "closest" pair matched

@kentquirk If you have a moment, can you give this a once over?  It's the final set of changes to handle suspends