Cleaning up more there/not-there filesystem bugs (issue #89)