Lots of cleanup related to minterm cover