Excelling at psychiatry

The question we are taught to ask to assess depression and psychiatric risks is, "Have you ever thought about hurting yourself or others?"  But I don't think that is sensitive enough, there is a high potential for false positives.  To better screen for those who are truly in trouble, I think it should be reworded as follows: "Have you ever thought about hurting yourself or others, not including while driving in heavy traffic or when trying to format a document in Excel?"