The changes from #118 and #119 need some tests.
The changes from #118 and #119 need some tests.