RT1815: More const'ness improvements