Having battled the two hour waits at both SFO and SNA this week, I have a serious suggestion for the airports:

Create an "express line for people who have proper documentation and NO CARRY ONS!

90% of the line waiters were with bags, but in neither case could I bypass the line to stroll through.

In the past, XRAY passengers waited. Now it looks like everyone does.