This is (mostly) addressed on trunk via check-in [d6b54239376f9513].