User blog comment:Staw-Hat Luffy/The Shichibukai That Fought Z/@comment-972068-20130426140303/@comment-8620864-20130426185920

Well Shiki is canon, they mention him in the Impel Down arc I believe.