Old pimpl replaced.