Simplify self-update code