SiLayerBuilder Cond/svc:
Continue factoring more common code under one place in the Impl
Impl
ping @jchapman