Slight re-organization of headings.