String diff tweaks

Some opinionated commits :)