TODO doc updates.
Some minor size optimizations.
Progress with the V2 mixin refactoring.