note some changes to semantics following conversation with Nico