Minor change to cancel-formula arguments
Minor changes
Fixed resolutions-of-current-theory* to use same-id rather than tc-eq on the
module-instance.  Needed since fixing tc-eq on modnames