add extra const
clean up demangle
whitespace change in assert