Daniel, I just realized I forget in the review about the tests. You should really add a test in the testsuite which verifies the behaviour of --record-only, so that it doesn't get accidentally broken in the future. Can you find a little time for that? Thanks again for your patch! Giovanni Bajo