unfold was still using ast::staff.