Finish refactoring merge for all dynamic objects.

Get all tests to pass.