Rely on automated early return from rollback functions (wikitext, 1dacef0)

This allows us to cut about 30 lines of code and should improve maintainability.

Signed-off-by: Greg Hurrell <greg@hurrell.net>