Further simplification of the Chiffon.Tools PSModule.