Fixed/float-point merge in foe.*