Converted without metaprog