Code cleanup related to 23711e37f7c839e12ecc7b5eae17680fcc353d53