Clean up handling of 'infinity'