Switched a bunch of modues over to using the newer m semantics for capturing a reference to this.