Everyone who's tried this branch reports that it fixes the sucker tube problem in all levels, so we'll put it in the next release (5.12c?). Thanks all!