Misc assertion cleanup
2 files changed