RxScala: Update signatures of retryWhen/repeatWhen to match RxJava