Rollup merge of #150159 - jdonszelmann:split-eii-macro, r=jonathanbrouwer

Split eii macro expansion code

r? jonathanbrouwer (since you did the last one too, should be quite trivial)

While investigating #149980 I decided this code deserved some splitting :)

Author: matthiaskrgr