Tighten default dispatch