Mergen & Fixed branch. XamlBinding was being naughty.