Removing dependency on unirange