Reworked noun classification again so that there is no "generic" classification and null can be passed to a renderer