The safer way to do this.
Did some code size optimization of the V2 mixin (shaved off about 300 bytes scrunched).