@hushell, if there is no big reason to keep the non-const one, let's just keep the const version.
Let me know if you come up with an scenario where the non-const function would be needed.