Yet more mutation-compatibility
Tail work

Cleaning up is cleaning up.
Fix missing l
Merge pull request #5124 from KA101/Mut-tidying

Mut-tidying