Improved support for optional/multiple edge schemas.