Remove dependency on <cassert>
5 files changed