[C++ PATCH] cleanup check_field_decls