You've removed the sole use of type_command; why keep this bundle at all ?