More porting to D.