Bug 997795 - Cleanup decodings. r=dkeeler