Split definitions and declarations into their parts and corrected some typos.