WPF: More work on WPF prototype.