improve demangler a little