Merge "Fix remaining 64bit calling convention issues and cleanup."