This is not yet ready to merge.

In the current form it:
* Fixes decoding 64bit integers
* Currently causes a spec violation (see discussion for possible resolutions)