In terms of EIP3, I'd think they should go with MAGI instead of AGI.  It is unusual for benefits such as this to be computed on AGI and to think that they didn't find it important enough to address not once but twice in spite of the fiscal impact.  I tend to think there wouldn't be a third time.