Auto merge of #17464 - wyatt-herkamp:fix-actix-macro, r=lnicola

Check that Expr is none before adding fixup

Closes #17463