Can this and the other `typedef` change be placed in their own PR for ease.