This patch changes the function Cluster.computeMoves to use guards and a
couple of subexpressions in order to greatly simplify it.