Minor fiddly changes. Almost done thinking through the integration model, probably a complete interpreter rewrite.