Constness improved