Clean up spec_helper.

Remove a number of auto-generated comments, move some things around.
Enable soon-to-be default behavior.

Tests still pass; enabling this now.  Now we're in the future.
Updated factory a bit.