cleaned up aliasing semantics quite a bit, but still not happy with the bulk nature of the pts-based strategy