diff: Pre-screening for dir cases; Diff formatting