Fix P::C violations, add some POD.