I think what you did with the optimization is better than my suggestion. If you think so, we can remove this branch.