Not strictly related to this pull request, so I've added this as a TODO to #280.