Merge "x86_64: Clean-up after cmp-long fix"