Ok,
went out and douse the MAF (wires in particular) with quick dry electrical parts cleaner.
CE was still on, so I took it to the Autozone and had them read. They were the same codes they read at the dealer. So I had the guy reset the CE, hoping that cleaning the MAF might be the solution.
So far so good, been flooring it all around town today, but about 20 miles of in-town driving on it since the CE reset, and it hasn't come back on. I'll get some highway driving in on the way to work tomorrow so we'll see if that was it.
Thanks for the help.