Amend type declarations for R18