Minor cleanup work.