GPII-952: Slightly improve messageQueue logic.