It seems like there is a need for some clarification here - that thread referred to above, which suggested those changes to the category definitions, created a considerable amount of feedback, not all congratulatory. Some points were left unanswered and hanging in the air.
Then there appeared to be no changes made to the help menus on the upload page, which implied (and as far as I know still implies), that the old categorisations still apply. At the very least this is confusing.
Someone could do with providing a definitive answer as to where things now stand on this matter. Is it the old - imperfect - definitions, or the new - dare I say it, imperfect - definitions?