Merge "Simplify find loop in check-unicode script"