small changes to nirc2_w and generic sharp cutout code