Try to add support for retaining type ids via TokenBuffer