Minor lint cleanups.