Random wartremover and lint cleanups