Issue 774: Expose contact information in the patient JSON export.
Minor naming and formatting-related fixes.