Add more exhaustive entity decoding.