May 2030 tap remains in SAFA’s sights