Issue #58: a bit of cleanup to get the 3.x tests to pass(?)