Further cleaned up code for handling collisions involving tanks and blocks.