Improve cast <fl> generation