Change listener second argument to be optional.