Minor refactoring pass on Pony. Move to reduce some of the complexity.