Cleaned up hanoi using the new field syntax.