When WaterImage meets a Squid or Magnetron

Currently, the WaterImage= has problems when it encounters a Squid or Magnetron - grabbed units rock and it is visible that they are cut off, while units lifted by a Locomotor= weapon retain the image of their water version. Because the logic originates from Tiberian Sun, it doesn't consider those circumstances at all. This request is about modifying it (expanding?), so it does.

The Magnetron part is easy - just make the unit switch to its normal image whenever it gets lifted.
For the Squid part, I'm not sure how to make this "fix". Maybe make the voxel rock only slightly, or not rock at all when in water (or make it optional)?