Moses pruning fixups and command line options