Rename FutureListener to GenericFutureListener and make FutureListener a shortcut to GenericFutureListener<Future>

+ minor clean-up