Clean up some x64 inconsistencies.