Cleaning up RemoteEpisodes by making NewEpisodeFinder into a Decorator