Remove unneeded is_const.
Tidy up special cases.