Make ia32/amd64 compile again. This is mostly a hack, but a more drastic cleanup is needed to do it the right way.
