Call `arrange` in `transfer_node`

Fix a few regressions, and add numerous minor cosmetic improvements.