We now only have one implementation of these interfaces, so let's just
state the underlying types directly. The system is still just as
coupled as it is before, but this will make it easier to find dead
code.