Added argument mapping to address space limit bookkeepping.