Refactor typedef implementations

No match.