Minor clean up after merge.