Rework PR#29 into an optional feature.