* Small cleanup of update code.