Cleanup to the object file parsing code