Cleanup
Add check on empty return group.
Update ango-definitions.md