Issue #3495403: rough in patch that does simple _creation pattern match to find creation states (works).
Closes #3495403