Add Attachment:DRY-161: Put type annotations in a Type constructor, to allow other annotations.