Eliminate most wildcard imports and fix resulting missing imports