core: bit of reorganization.