Clearer naming from remove ref and const fn.