Removed gratuitous if blocks from Board.calcAd...