Tightened up detection of content models.
Fixed message for API05.