Made the enter callback implicit by returning a Deferred.t

incidental: remove some unused variable warnings.