Fix helper.Escaper decorators ... again