Remove unnecessary wrapper closure from return-less function