More tweaking for the changed HPX_ASSERT