Misc cleanups.
1 file changed