Resolve some "discarded type qualifier" warnings. (dm)