THIRD TIME. Richard pointed out (again) that I'd switched the order of the...

THIRD TIME. Richard pointed out (again) that I'd switched the order of the instance variables; and thus failed to repair the ABI break. After this, I'm going to sit down and watch TV for the evening.

llvm-svn: 203631