Refactor typedef implementations