Slight cleanups.