Added #159 here to avoid losing track of this. This PR is big enough as it is, let's not make it more complicated