Follow up to #83. All tests passing.