It's always been fairly easy to just get a multiple entry "Non-B" visa instead of relying on visa waiver, and then no questions asked.