Kind improvements from @tgfjt