Rebase newtypes (#233)