Fix up the AssertXext problem, as well as adding it at calls