Fix vehicle collision events. Some minor cleanup.