Use the new simplified .command internally

This should be mostly backward compatible. One excepton is .match which
used _mad_command before.