More fiddling with implementations versus interfaces.