Final changes for #89.