Fixed/float-point merge on degutil.*