Convert -> Pimpl in comments