Only include the decoding map if no table can be generated.
Added new support for decoding tables. Cleaned up the implementation a bit.