Now functions handle tzinfo parameters appropriately