Comments from @skearnes, plus one new test