Refactor to remove unnecessary scaffolding.

Current spec status: 367 examples, 0 failures in 1.18 seconds.