(Fx_parse_geometry): Unify the X and NS versions so that they share a