Expand macro annotations with explicitly provided type args #2