This fixes some issues where the types were causing different alignment
rules for Windows than we expect elsewhere.

This supercedes !48, and is based upon ZUHONG TAO's work there to include
the necessary changes for alignment fixes.