* decl.c (cp_finish_decl): Mostly revert previous change.