More work on js:tgp grammar in 14.water.