AS my const pull is ready to land, you can probably safely get rid of the TODO: fix de-const cast... comments.