More work on #193.