Update joinpoint signature after rebase