Misc cleanup before merging.