Clean up dependency management, squelch many (pointless) warnings.