bring 2.x up to date with recent 1.x work

[keturn]

PR #20 was one proposal along these lines, but I think
a) there were concerns with approach, and
b) there may have been additional updates since then

[keturn]

Closed by #47, which provides a way forward based off the v1.x branch and abandons the 2.x line.