Making address calculation shared and (maybe) fixing it.