Also made CValue::ConvertKeysToPython use faster list creation and improved some of the macro formatting.