Further merging of fixed/float-point in foe.* and frag.*