diff --git a/examples/dataflow/fibonacci.py b/examples/dataflow/fibonacci.py
index f58000674..709cfe499 100644
--- a/examples/dataflow/fibonacci.py
+++ b/examples/dataflow/fibonacci.py
@@ -1,5 +1,3 @@
-import sys
-
 from migen.flow.ala import *
 from migen.flow.network import *
 from migen.flow import plumbing
diff --git a/migen/flow/plumbing.py b/migen/flow/plumbing.py
index 9d5736f49..8a6de4d45 100644
--- a/migen/flow/plumbing.py
+++ b/migen/flow/plumbing.py
@@ -14,7 +14,7 @@ class Buffer(PipelinedActor):
 		sync = [If(self.pipe_ce, Cat(*sigs_q).eq(Cat(*sigs_d)))]
 		return Fragment(sync=sync)
 
-class Combinator(CombinatorialActor):
+class Combinator(Actor):
 	def __init__(self, layout, subrecords):
 		source = Record(layout)
 		subrecords = [source.subrecord(*subr) for subr in subrecords]
@@ -32,7 +32,7 @@ class Combinator(CombinatorialActor):
 		comb += [sink.ack.eq(source.ack & source.stb) for sink in sinks]
 		return Fragment(comb)
 
-class Splitter(CombinatorialActor):
+class Splitter(Actor):
 	def __init__(self, layout, subrecords):
 		sink = Record(layout)
 		subr = []