This is more of the same refactoring that has been happening. This extraction also helps emphasize the relationship between imported objects, and isolates the growing number of test cases. This parser will only grow. DEV-13708