Small code refactor to remove duplicate code. This make sure the new cast is also done in both branch.
