Done in #29.