Improve collection / map decoding with target type.