Replace direct GUID comparisons with CGUIDHelper methods