Be consistent
Be even more consistent using tree functions instead