making assert stronger again
scripted update of code from master at 2a02241 making assert stronger again