Having a global `defer` prevented the tests from detecting the error fixed in 79d97eed1963172d358f60317d4e8a5ced171618. Move them all to a single namespace: `helpers.defer`, etc.