Decrease nesting in genMoves