Simplified the Trailers handling and hand everything off to the Trailers plugin. There is now point maintaining support in two places.