And yet some more const removal