A little more cleanup.
Resolving minor merge conflict.