Well, the engine appeared to run nicely going home from the shop with a new timing belt and, as it turned out, a new battery. The following morning (yesterday) it started to stall on start-up and ran really rough. Today I got the Check Engine light as well, so it's going back to find out what the heck is going on, I was hoping it was just that the new belt needed retensioning, but somehow I doubt it.