Can't actually return from a block.
Slight refactoring of the client.
Support "scm :git".