Beeper already does this where possible.