Tweaked queue-checking and interpolation code.