r15343: Some small cleanups.