Understood. Lets do that in a separate JIRA, then. I'll capture the change. There might be other areas in the code that rely on the specifics of the pattern like this.