Small refactor.
elpa update.