IMPL: use the new way for all cases
GC: cleanup
GC: more cleanup
TEST: implement test for gh-17
TEST: more testing. Turns out something does not work
TEST: adapt test
FIX: fix option parser
TEST FIX: initialize
FIX: at abort, restore initially checked out branch rather than target

X-Bug: gh-17