Move NSEntityDescription work-around code into an extension.