address @nedbat review comments