Fixing up static decl mess