Using a typedef to cut down on merge conflicts with other branches.