Add extra assignments, make functions local.