Work around weird --remote skip of finally

Closes #152.