Properly compute assertion percents, close #1942
minor clean up