rice: Various whitespace & comment touchups.