WIP: fix one source of problems, now shift back to 'TODO this clause needs more review'
WIP: fix one source of problems, now shift back to 'TODO this clause needs more review'

basho/machi,basho/machi,basho/machi