Removed some duplication.
Garbage collected a completed story.
Added @Deprecated
Fixed type signature.
Simplification to test setup.