Some clarifying comments. Might rethink this, though.
The actual changeset. Should have been there all along.