Tweedmorris master

Finish the work of #172. See also #186.