Updated parser to handle entity constraints correctly.  JSONMetadataParserTest now passes (sans hooks).