Make machine_batch auto batching sane
Also allow machine_batch to contain machine declarations