Add foreign keys to schema for diagramming, clean up parens