Split out context-marking from add_address.
1 file changed