A few minor adjustments from CASNR