Transitivity clean-up