[3074] Make use of the new swim movement wrapper