intel: Small compiler cleanups.

This is part of another series that I intend to send out later this week. I think that series will probably take a bit of time to get reviewed. Since these commits should stand on their own, I thought I'd send them out first to try to get them landed sooner. This also keeps the other series a little smaller.

The first patch changes code that @sagarghuge added, so maybe he'll want to review that change.