improved support for infinities