Adding a way to handle xid commands that apparently need a little extra time. Also, modifying an assert to prevent false positives.