HCOLL-99 minor refactors