Update hickory and remove old nil handling stuff.