Cleaning up the 32 version for synthesis.