Done as #85.