3.0 - Update docs.

Also, avoid a couple of assignments.