Reducing long lines (for houndci); saner key order

(based on transfer.rb)