This simplifies the code base, reduces the risk for mixups and gets rid of the use of a local nonstandard typedef.