Some minor code checkin for MachineEdit (not finished).