Proposal for #257.
Closes #263.