Revert "`when` unnecessary with `dolist`, and then `let` seemed unecessary as well"

This reverts commit e3a3a14e0f35b7a9d70e116ed047ff628a9d4921.