Require ostruct and fix namespaces.