More thrice

May have merged #753 prematurely, discovered more things for which `thrice` should work.
...and there's duplication here, too.