fix decl use with multiple redeclares
add redecl assertion back in