Separated handling of collisions between tanks from handling of collisions between a tank and a block.

Each of the two situations requires a different response.