Fixed/float-point merge in foecommand.*