more typedef removal stuff