Minor cleanup and docs updates.