OK, deferring this TODO for another branch. Want to get this semantic into the next Beta, optimisation comes after.