Converted more files to D.