HCOLL-240 improved assertions