tower: simplify thread comparison, remove hack.
tower: add phases.
Merge remote-tracking branch 'origin/phases' into master