More thrice

May have merged #753 prematurely, discovered more things for which `thrice` should work.
Same comment as above; I think there's duplication here...