SM-2286: Fix Await trait logic to actually check again after the final wait