Minor cleanup to avoid NCDFE when using legacy assembly