Support new upstream manually-mapped types