REF: Get rid of plain assert.
Merge pull request #1336 from jseabold/assert-clnup

REF: Get rid of plain assert.