MORAY-152: rework internals to not all be hidden, such that we can pedantically cancel