I think the locals are unnecessary here, I know it's not part of this pull request... but @taratatach can you delete it?