Clean up for Pyconfig 2.