Minor rewrites.