Simplify validation

Validation wasn't making use of exec's retry and try_sleep
options, which made it more complex than necessary.