Attempting to bring up to date.

I can't get decode_iter to work properly. Type inference seems borked
somehow. Gah.