Improve the code with missing improvements found while updating Willow in various products that use it.
Improve the code with missing improvements found while updating Willow in various products that use it.