Merge pull request #874 from YosysHQ/clifford/andopt