CanaryCommand original constructor readded and pulling TabCompleteDispatch back to package private