Expanded Facet subtype checks.

This is to bypass FORGE-1304 for now.