Return `Option<char>` from `peek()` and `peek_next()`

[ntalbs]

I changed peek() and peek_next() to return char instead of Option<char>:
c73ab9f

But it doesn't look correct. Change back, and handle the returned Option<char> correctly, not just use unwrap().

[ntalbs]

d314e39