Appllied 'Fixed PartialTypeWithSinglePartIssue for nested partial
types.' from luiscubal + fixed an issue.