Fixes issue #83, and a few associated ReSpec cleanups.