Etymologies are now divided into three:  a root, a pre-root (which will take care of most prefixes) and a postroot (which will take care of most consonant add-ons). The question "what is a cognate?" remains, however. (This is especially true with true compounds, like Latin nōn, which comes from ne+oynom. Should it be listed under ne, or oynom?)