A few more changes for capturing pairs.