Merge "Fix bug in register allocator."