Update how 32 and 64-bit builds are both handled.