Fixing issues introduced by the merge.

Apparently understanding the code helps during manual merging... who knew.