Why did you change these? This is the source of basically the entire diff here - I can't tell where you actually fixed your bug in all the noise.