Further removing the use of the peek value and the explicit value type in general.