Cleaning the MAF seems to have fixed it. Day 2 and still no light! Pased emissions test with flying colors!
I will put the O2 sensors on my list of things to do though since they are probably about due.
I crawled under the VX last night and they look pretty easy to get to.