More work on #188.