Cleaning up some of the tribe saving code.
- RMUR