Yeah, I thought it would be nice to have const-correctness in the whole file but given that it requires a pretty big amount of changes it would be better to do that with another patch.