Clean up CifParser a little.