Cleaner trace manipulation, remove assertion allocation suffix, ...