Fix ALL the compilers.

A couple of the previous fixes weren't working across all of them.