Remove unused assertion
Whitespace cleanup
Factor out map function `value`.