Fine by me, but this code will change significantly once we refactor local maps anyway.