The best way to avoid the fireworks altogether is to remove the negative terminal first. If you start there, the only way to cause a short is by direct contact with the positive terminal, which should be shielded with an insulated cover. And once the negative cable is off, if you touch anything with your wrench while removing the positive cable, nothing happens because you no longer have a complete circuit. See? No sparks, no fire, no smoldering motorcycle.