These share too much yet have very different constructor signatures and property exposure. Just a clean-up pass as I begin to look at replay submission.