Fix some dead code/testing issues.

See discussion on #180 for details.