Extended team-based goal completion to collection and leaving sides goal types.