Transitive watch infection partially working + cleanup.