improved my-mc/mark-all-dwim