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