See attached, as discussed on IRC. Motivation described in commit message.