Line 16 is also a bit of overlap with PR #15. After #15 is merged into master and rebased into this branch, I'd expect this line change to be gone. While here during the rebase, would you mind sorting line 17 alphabetically?