introduce _add_stars_in_decls and make smarter