TODO cleanup: already addressed when fixing #52.