Changes for reactive-banana 0.7