Thanks again, Petr. I've changed both occurrences. Bryn, can you make the latter one (in _dm_reread...) misbehave? I've added a test to exercise the former. Here are the patches I've just pushed: