Optimize Extradata handling a bit