[1/5] Catalog zones lightweight cleanup

Do some lightweight code cleanup and fixes in preparation of adding some new feature from the latest DNS catalog zones draft.