Fix and, bi, and non-Core TermNames messsing up DepMaps. addcom verifies.