SI-6609, eliminate special case in pattern matcher.