I believe that anything that isn't explicitly hentai belongs under either smut or ecchi, and possibly also josei/seinen, so people can just exclude those tags later when that becomes possible.
The problem is that it might seem obvious to some what should and shouldn't be classed as hentai, but...