Adjust to CodeHelpers having been updated