Making progress on the curry macro.