Fixed regex checking of dedup enabled. (commit: 5df10769c1628b7627430475084fa62c681e8ad5)
Fixed some dependency screwups. (commit: 98ab3ee8781a544802d83d1290442e96a8f85c90)