Added some type abbreviations to make type signatures more readable.