The light finally did go away - for 2 weeks.
So I bought a new Mass Air Flow Sensor for a couple hundred bucks, (took 5 minutes to replace) and it took about 4 or 5 days to clear the Check Engine Light indicator.

Ever since then the car runs smoother and there's no check engine light.