Silence a warning
Use more make_unqiue
Optimize Extradata handling a bit