core: some more cleanup of USING lists.