Issue 359 - Potential Go 1.17 improvements (17)