These two features were largely an internal fork,
let's refactor them into a single tunable one.