Merged beside #148 the two would not compile (SetFail declared twice, m.Fail undefined). #148 lands on its own.