Style tweaks and typos.