Re-indent some PHP code; no code changes
Add individuals to the listing

Re-tool the helper functions a bit to tolerate handling both
organizations and individuals.