Here's a patch against your bk tree that keeps things building for sn2
(and working with the discontig patch applied).