Expand macro annotations with explicitly provided type arguments (#2)