Minor improvements to user-cancel.