Clean up a bit by using Content::film() more.