Merge "Fix pointer arith."