Constitutional Reform and Governance Bill

At this point, will the Minister clear up one particular problem with the drafting of clause 37? Clause 37(1) says:""The office of the Comptroller and Auditor General is to continue"," but it does not say that the person currently in office will continue to hold that position. Can the Minister confirm that that is the Government's intention, and that these arrangements will not apply until the next appointment?