Did a method signature reordering, cleaned up generating the ObjectLinks from a Client, etc.