Many of these could benefit from a rethink now that we can expect
a pattern also on shell commands which succeed.