File monitor overhaul, again.