Merge pull request #2368 from reaperhulk/asserts-begone

start converting asserts to a function call