(Menu) Refactor more ST_FLOAT code