Improved status --clean behavior