@tschaub, now that #814 is merged, will you address this comment in another PR?