Still more improvements for #35.