Miscellanous cleanups in preparation for the merge.