...and generalize/de-noise the script a bit.

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