SI-8597 Improved pattern unchecked warnings