Another nan/infinity change
Put Carp use in correct package