GEO_EXPANDED_ENVELOPE renamed and reimplemented.