Tried to clean up status and filter filename and string handling. Appears to fix spurious diffs on Windows.