Add self contained CWAssert and switch to it