Rewrite `decode-int'

Rewrote `decode-int' to be in terms of `decode-short'