Re-introduce TargetFramework filtering, as it appears to be needed in some cases.