Some declaration_static marking fixes.