Plant sexual reproduction: perhaps the current plant two-sex model should be replaced with three- and four-sex models?

The two-sex model makes the assumption that there are only two sexual reproductive states: male and female. However, in land plants (embryophytes) the application of this model to the alternation of generations life cycle requires the subtle redefinition of several common terms related to sexual reproduction, which seems to obscure aspects of one or the other plant generation: For instance, the homosporous sporophytic plant is treated as being asexual, and the gametophytes of angiosperms treated like mere gametes. In contrast, the proposal is made that the sporophytes of homosporous plants are indeed sexual reproductive organisms, as are the gametophytes of heterosporous plants.