Focused things more on simple writing. Ditched some hooks intended for extensibility (since that's not really the point any more).