Some more small cleanup.