More work on the Internal annotation transformer.