Two-character annotation for one-character

Also elaborated on composite types for references.