Merged ArraySeparator and Separator superficially, methods were not modified. All tests still pass (except the dummy tests for macro serializer).