Yup! My thoughts were the same. And with the Yojimbo portion, I simply added some context to the events filling the backdrop and motivations of the characters. :)
