Numerous fixes to A/B mode so that at least it doesn't crash (#72).