Compatibility issue with WPF projects #22
Description
There's a compatibility issue with WPF projects, for which there's a workaround in e6aa10b. We need to tidy up this workaround, make sure it works for both WPF and non-WPF projects, and then roll it into all of the libraries.