Merge "Code cleanup in preparation for x64 backend."