Small mod to clean up after the merge.