Finish the conversion started with commit 36ce1124.

Minor tweaks to make the tools consistent within themselves.