small tidying-up in support of hkfx