Refactor Machine, out of ajtalk