More massaging of move.rb.