Separated range exp init and cleanup - thanks callgrind!